Merge changes from topic "move_BSCH" am: 81d8d47876

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

Change-Id: I1e27a7fcde0ba83ffcad525ca091af7fc5ced2db
tree: fa2244f821aa01f4b63312fd00129c5228832c7d
  1. core/
  2. services/
  3. tests/