Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74

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

Change-Id: Ic05e38726cd2f42e919553a11eb0ce6944ce0d20