Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18624095 Change-Id: Ie2f7e9d9f56c31ba342b790e565b547728524bae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>