Merge changes I17742019,I2768b276 into tm-qpr-dev am: c6c69ced am: 7d84b1ff

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



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