[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L52200000960664466:N84600001369065936" into udc-qpr-dev am: e586fe14 -s ours

am skip reason: Merged-In If33bee4e875812ce3710d41014cae8bd54d840f2 with SHA-1 fb6dd74b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23246431



Change-Id: I3f84d82702129c8d13f94efb4afb6380430d176d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>