Merge changes I0e6df469,I3d46d5f7 am: b9c396b87a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I13daedf40a5b0569b78ace23f36ab971c45bc690