Merge "Migrating SettingsLib tests to /external/robolectic." into udc-qpr-dev...

Merge "Migrating SettingsLib tests to /external/robolectic." into udc-qpr-dev am: 95e25521 am: 5b62cd0c

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



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