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