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