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