Merge "[Settings] Suspend some test case(s)"
am: a70e45b03c

Change-Id: Icaddf7a6f31d938af3f4a748f81c4890dc06fd52