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

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

Change-Id: I406e888619a6e765cedbf301851b67bda8e2eab8