Merge changes I5e1802c5,I4542568f,I99a052d7,Iae89206d,Ie955266a am: 9ca3672319 am: 918cc97a12

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic99132f50babb1d890f737dc3a54e5b381f3c890