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