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