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