Merge changes from topic "presubmit-am-8386d95b417b44ec949ea1037dee7266" into tm-mainline-prod am: 83e75381

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

Change-Id: I930be8a26105df5e49c2ed3579c9db706d8a8aa9