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