DO NOT MERGE - Merge ab/7272582 am: 8b46ef0456

Original change: https://android-review.googlesource.com/c/platform/development/+/1736005

Change-Id: Ib0a99dcdf79e9653b4db5743de5a5ad8632f19fc