Merge changes I6b4df388,I07becea2 into sc-dev am: ce8ca17d89 am: d05064c225 am: 65ebcd0daa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15191539 Change-Id: I9512ca0553a5f5eeabe9c3d399d34c565ac1d169
This commit is contained in: