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

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

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