Merge changes I26fd4fd2,Iaadf6e9b,I7d42f8a7,I0482376e into stage-aosp-tm-ts-dev am: 744c329227 am: 5c5c78aa51 am: 6188e3b113

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

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