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

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

Change-Id: I7da537200efe31e803234bd1a0236843064186c8