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

Original change: https://android-review.googlesource.com/c/platform/system/media/+/1982734

Change-Id: I5d65376886c76d15e9274aedb3cafbd2587e8758