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