Merge changes from topic "unicorn-1" into sc-dev am: 0fcac8bf0d
am: d1935d9166
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972492 Change-Id: Ia49a4cd87c10e8f7c75396585dfa09f7cfaf5dc8
This commit is contained in: