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