Merge changes I34ef76ec,Icf686c3d am: 7f60b13ff5 am: 7d8db6692d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia85c2c51f678fc72afb4ca7ad457c56f36425ca9