Merge changes from topic "sep11" am: c0b28813 am: 69e6f073 am: 741c0a78...

Merge changes from topic "sep11" am: c0b28813 am: 69e6f073 am: 741c0a78 am: da7478b5 am: 487d3942

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

Change-Id: Id01f468b43fd5b2aada78608010625b392c1b647