Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74 am: 9c2293ca92 am: 9713bec956

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

Change-Id: I2c7e0aeb425596f168a08f7c7bec653f5244e12e