Merge changes from topic "move_BSCH" am: eb3543b17f am: eeb5b619f4 am: 62dad9e860

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

Change-Id: I09068be6ac4d220c3e9e9242f3e0eb2cf5d01e23
tree: d5a5a327d6bef024d5722af9aaaa0b6675296061
  1. framework/
  2. OsuLogin/
  3. OWNERS