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

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

Change-Id: I33ef19a3485a77f426b75aeb95e0ae3a57a336e0