DO NOT MERGE am: 277e7e0586 am: 903db9a032

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23449211

Change-Id: I6c05d7ea6fa11b39be01da3751f3148fec573ac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>