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