Merge "Correct ownership of AppSearchPersonTest" am: 8a1d03fe10 am: 03047824e4 am: 8c3a3e3eaf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8423abfaaae68bd25d8d716bbb403bb2c5858668