Merge changes If58d648d,Iec51a349 am: de246e1658 am: f5075fb162

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I913f264d55280bcec9d7b2e86f2b30090840d26a