Merge changes from topic "unicorn-1" into sc-dev am: 0fcac8bf0d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14972492

Change-Id: I717e9492acf3f3ba054c79f0d807606e7c294e98