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