Merge "Fix some incorrect annotations in AppSearch." into sc-dev am: 625d330a48 am: 0d55ad7179

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

Change-Id: I26ac05cdd5656d8d6ef46eea862c569863df6316