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