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