Merge changes from topic "sep11" am: 9cf5f56268

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

Change-Id: I4fd71573b4301e5473d44517a72d73858b3928c8
tree: d0e3e88942c823e991e9f38de932d9437e4e9736
  1. core/
  2. services/
  3. tests/