Merge "Fix activity NPE when clearing flags" into sc-dev am: 394ede6fe6

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

Change-Id: Ie684c1fbfb72cc3a20af17ed7dd435984cadf400