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