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