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