Merge changes Ic41fdc40,I5851a36e am: 34989a9c9e am: 5996679b4b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d16914403745fe0a1421423667ad3a7cd00a4e5