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