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