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