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

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

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