Merge "Revert "Migrating SettingsLib tests to /external/robolectic."" into udc-qpr-dev am: a81b1bc89c

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

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