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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc7fa53e74c2c4af89df02f1610105f1e62d06c4