Merge changes I7c3cc40f,I6447a920 am: 0131053210 am: d0bbe8968d am: 6e4c2aee8d

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1432313

Change-Id: Id2c698987e27b4b2e605737b69bc8527499340b2