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

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

Change-Id: I8fed607cd748348e714470f5fe8159abe445313d