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