Merge "DO NOT MERGE - Merge ab/7272582" am: d14ce2564e

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

Change-Id: I27ca17bdec0d956df51e5291f1a0eeb477bb3ecf