Merge changes Ib80f814f,Ic605e489 am: 02929bde11 am: 39e98823a3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f41a9cd27dd37c859e69fe02a32b9ab13fb0d46