Merge "Update mocking to correct target methods" am: efa884758b am: b64bf233a3 am: 7dce573e9d

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

Change-Id: I99179fe4a754849f50f6b06ce9b7424a88478184