Merge changes from topic "upstream-hal-v7_1-p4" am: faab202a2d am: 4dd84e0f6f

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

Change-Id: I73c6b247dc7c7e3c142fc2b7062415bc1b0c1542