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