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