Merge changes from topic "sep11" am: c0b288133a am: 69e6f07347 am: 741c0a78cc

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

Change-Id: I9b79dbf3e9983523db11599d8ae289b05aabf80c