Merge "Catch SecurityException from NoMan to workaround possible race condition" into tm-dev am: 1cd4d369a2 am: a2e7ca746f am: a1f892ca08

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

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