Merge changes I0f37f856,I55dc5c2a into sc-dev am: 5dea7907f3 am: acbb44cab3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15193078 Change-Id: Id899e53bb4c369fc18f6176fc2b92f3ccf0e19f5
This commit is contained in: