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