Merge "Take snapshots of SettingBase subclasses" into sc-dev am: 4de5e908 am: c36aa45e am: 5944fcc2

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

Change-Id: Ia9c8637112bc2b93b475e584decfecf39fa37f43