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