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