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

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

Change-Id: I3c14ab887a0c8529f17b9ed1eb49e1d01bc02be1
tree: 120478e68ef9a51de7ab8aa4d0017be837f2d098
  1. framework/
  2. OsuLogin/
  3. OWNERS