Merge changes from topic "kchyn-unicorn4a" into sc-dev am: 678a57b0df
am: 83a8b9141d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14991599 Change-Id: I7d86a089fdb9043de0f2509c62cea73114f6144d
This commit is contained in: