Merge changes from topic "sep11" am: c0b288133a

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

Change-Id: I4fd71573b4301e5473d44517a72d73858b3928c8