Merge changes If58d648d,Iec51a349 am: de246e1658 am: f5075fb162 am: a6de64a7b6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa608d60c0e4623ea1ef2a8020f2c131e7495411