Merge changes from topic "move_BSCH" am: f383d088a5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1503395 Change-Id: I1e27a7fcde0ba83ffcad525ca091af7fc5ced2db
This commit is contained in: