Merge "Take snapshots of SettingBase subclasses" into sc-dev am: 4de5e908 am: 52a76e36 am: 2da9588d

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

Change-Id: I74884437861c253d07e0ae9b643aba6e1af2dc4f