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