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