Merge "[SettingsProvider] perf test for null settings" into udc-dev am: aa66f400 am: 3b792e1f

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



Change-Id: I449efedd371b8b1eca26f231ba8f74b1d38210fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>