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

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

Change-Id: I9dca568061287683b9acbd8dd444771291b344b3