Merge changes I6512d3f7,I99bca71c am: eccbfe4b72 am: 26d42f094a am: 50a13c982f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I57c4dffd22338d850beaff7b2575204ee2a42cd9