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