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