Merge changes I0e6df469,I3d46d5f7 am: b9c396b87a am: a3bb15cb68 am: 8b9dd57280

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44e26cb8d6e8071c7467316bfb60047d1ea10a22