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