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