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