Merge "Add recommendation setting and remove app settings" into sc-dev am: 8beb8407 am: 015e01c2 am: f3ab67a1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14722119

Change-Id: Ia13f82ce8924b87cb89d7fcbb55e677f0e832393