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