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