Merge changes I0b36f486,Ida0d0dee into sc-dev am: 40943ec440 am: 71dbd0646c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14542050 Change-Id: If9b48f3633364540bd6b61b7b55cd97d920530b1
This commit is contained in: