Merge changes I6eca0331,I346323cb am: c9af6cf307

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2320254

Change-Id: I5f312536e73d6ed44e3feaca0e025dfda1543650
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>