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