Merge changes from topic "move_BSCH" am: eb3543b17f

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

Change-Id: I1e27a7fcde0ba83ffcad525ca091af7fc5ced2db
tree: dd45806e40398d2a8e262b8605cf50a23d01c33f
  1. framework/
  2. OsuLogin/
  3. OWNERS