Merge changes from topic "Annotate Platinum Test" into udc-dev am: 879d746d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23404501



Change-Id: I35717bffe20d28639918bc48e94b1a5a97216ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>