Merge changes If03d8ee3,I701d9d6f,I715e0e53 into sc-dev am: 73ffe99b7b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15193088

Change-Id: I704c5ead215c6e63dfff1c12b9e3f048cbcea266