Merge "Fix shortcut rotate trigger swipe notification" into sc-dev am: bd1d8412 am: 6b451802 am: dcbd0273

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15017733

Change-Id: Ib383c49e2737cc182d97863bfeebf27e0090b978