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