Merge changes from topic "move_BSCH" am: f383d088a5 am: e757414483 am: 3c5243c309

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

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