Merge changes from topic "egg12" into sc-dev am: 51204c44 am: 47eb742e

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

Change-Id: I038bd4729d4c7913c32702f9c169692ad41f325b