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