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

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

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