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