Merge "Fix hotseat border space crash GSI" into udc-qpr-dev am: c6b6a4f3d5 am: f17a1d43f3

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

Change-Id: Ia2784fb0bb345b988be15f32492064768881b1fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>