Merge changes from topic "move_BSCH" am: 1b414d61b4 am: 2ea9048daa am: 7becf08476

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

Change-Id: I09068be6ac4d220c3e9e9242f3e0eb2cf5d01e23