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