Merge "[Settings] Fix failure test case" am: 57a7978f8c
am: 54ee717db8
am: 718c17039e
am: 29863c9d8d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1916457 Change-Id: Icae124324889814429e85c6a4fef78a58e1b6850
This commit is contained in: