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

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

Change-Id: I9b79dbf3e9983523db11599d8ae289b05aabf80c