Merge "Fix header protection interactions" into sc-dev am: b605d1d73c

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

Change-Id: Iac83cfd896c41a35f3a2e5ebfb8301c2a136e99d