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