Merge changes I65dbc509,I1e338d9c,Ib4a0ed69,Iac7077b4,I9c53d425, ... am: 067b3dffa4 am: df66b72918 am: a688d224cf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11b6770287f670ec3cd9b53339377f0a4cabf14e