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