Merge "Fix SettingsLibTwoTargetPreference broken on Android R devices" into sc-dev am: 082693eddc am: 506054fff7 am: 228b4091e4

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

Change-Id: Idfa2d7f8383c799db1202c0634d2e0f946361af2