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