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