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: Id28acf8435380e779d7771062b4d280d67957362