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