Merge "Fix test source reference" am: 09dcc2da3e am: c0d04de42d am: 565d5a1107

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952376

Change-Id: I3a10a8e6d9180d0863f2db4c7befc251f4b48148