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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I761d254de2413b06c51bf7c4994f8d8c12a01fb5