Merge changes from topic "egg12" into sc-dev am: 51204c44 am: 6b414510 am: cba5c9b8

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

Change-Id: I4628225c8b2e346d4f5e7e84e9ddb2a6f843bf01