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