Merge changes If81cda01,I1df8b8e0 am: 3351717493

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26af56f725ad03555b7991f51cfbebbbbdd758d7