Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 7a7e6e5ace

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

Change-Id: Icf2e7b0f8668fbf0c928a023bc9ed0690f61b295