Merge changes from topic "am-82b42a6714224b3695f7cad98786c537" into...

Merge changes from topic "am-82b42a6714224b3695f7cad98786c537" into tm-d1-dev-plus-aosp am: be3412fc -s ours

am skip reason: Merged-In If88642e238e64ca9ec80303a4a72f7171c63464f with SHA-1 43489275 is already in history

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



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