DO NOT MERGE - Merge ab/7272582 am: b8a285324c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1736022

Change-Id: I9c24e89db989785483f0db8d5dd97da78edde36e