Merge "Remove recommendations when setting is disabled" into sc-dev am:...

Merge "Remove recommendations when setting is disabled" into sc-dev am: c1d7a61b am: 2db99600 am: 6eadebf7

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

Change-Id: I1e4a2d9a57775e4cf27d837872e4dd6ef8cfe4a2