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

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

Change-Id: Iaf6a28813f252b205872a0256b419449c3b69601