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