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