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