DO NOT MERGE - Merge ab/7272582 am: 8b46ef0456 am: 01a4d205b0
Original change: https://android-review.googlesource.com/c/platform/development/+/1736005 Change-Id: Ifd74cec9577e53b1d38e04ea042d358a335274d9
This commit is contained in: