[automerger skipped] Merge changes from topic "move_BSCH" am: f383d088a5 am: e757414483 am: 3c5243c309 am: f645c0e447 -s ours

am skip reason: Change-Id Ida30c877116090616d4bf3f87fdad835446dac84 with SHA-1 e51f66472f is in history

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

Change-Id: I619afbbffa4b9ed804475c994310fc9f73fca588
tree: 4644400d6efb38c5c207b4cf309dd0cff828120e
  1. core/
  2. services/
  3. tests/