Merge changes I5ce7fe05,I2d5dc5b9,Ibcc4bdc0 into sc-dev am: 211f7f9e am: 66a2885f am: 158e4d4c

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

Change-Id: I6ff1eb8971551dded10717585ccd22f1bfe66a31