DO NOT MERGE - Merge ab/7272582 am: ca6f8a9f6c

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

Change-Id: I58f4cd524010ea13d2437abb6bf37cbea0b9f528