[automerger skipped] Merge changes from topic "move_BSCH" am: eb3543b17f am: eeb5b619f4 am: 62dad9e860 am: 6bac691924 -s ours

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

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

Change-Id: I619afbbffa4b9ed804475c994310fc9f73fca588
tree: 4e470ebf304d4823ce0bae23b87f0d6592d2109e
  1. framework/
  2. OsuLogin/
  3. OWNERS