Merge changes If81cda01,I1df8b8e0 am: 3351717493 am: 389332a285

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7c521e779ba55f7bea832ade8ff92d9465339bd