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