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