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