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