Merge changes from topic "sep11" am: 9cf5f56268 am: e684d1e089 am: 2b4b4814ae am: d9f660006e

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

Change-Id: I79488866c538bf9e76d0a6429e30262978f6fdab