Merge changes from topic "upstream-hal-v7_1-p2" am: bd3adb2306 am: 0f367d5c81 am: 7ed25ef8f5

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

Change-Id: Ic5e31d337f6b95cd6a67af88e7fbaf5bd9949596