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