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

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



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