Merge changes I177ec607,I68f364b4,Ib3b9f52c,If040d61e am: ebe2e05464

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic30796bc2354ba9d29057886e5c9e3b20ff1250f