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