Merge changes If03d8ee3,I701d9d6f,I715e0e53 into sc-dev am: 73ffe99b7b am: 21c22d3b67 am: 54806968ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15193088 Change-Id: Ic7ce1317582fb05994856aab84fe8f64c5ebae07
This commit is contained in: