Merge changes I4f38a539,Id4f6c7f4 am: 22823382e4 am: f344ab8f12

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01f1b30d188e4cedcdb34bcd8f7f25ac1a5c64b4