Merge changes If58d648d,Iec51a349 am: de246e1658

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I227f65bb3ac66c6b4447358cce3006d10056c83d