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