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