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