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