Merge changes from topic "revert_ui_mode_changes" into rvc-qpr-dev am: a18b9f3e

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

Change-Id: I6a3c606e2d5d7882909ff179d41e507c117f6df8