DO NOT MERGE - Merge ab/7272582 am: ca6f8a9f6c am: 1983e95fa7

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

Change-Id: Ibd1acae638906e2707ae52bd69bd46b379f2374e