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