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