Merge changes I61c32c74,I505c9b04,I5c19e6a8,I24e86a75 into sc-v2-dev am: ac2c9b4576
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15683506 Change-Id: I6db1eb3cf9e951f682c9c38474337e755f95f9b5
This commit is contained in: