Merge changes from topic "egg12" into sc-dev am: 51204c444a am: 47eb742e3b am: 5d93908ce7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15241669 Change-Id: I4eba8e780ab868c3011f640af6a7be170c644c34
This commit is contained in: