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