Merge changes from topic "am-b60f539c-4933-450b-b98e-9b22d17cb071" into ub-launcher3-master

* changes:
  [automerger] Fixing Launcher3Quickstep build, broken due to SDK changes am: ea992acc2f
  Fixing Launcher3Quickstep build, broken due to SDK changes