Merge "[Settings] Fix roboletric test fail and add new test case." into...

Merge "[Settings] Fix roboletric test fail and add new test case." into udc-dev am: 08366227 am: 44fddb45 am: 7c55f015

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691723



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