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