[automerger skipped] Merge "Simplify exposing external interfaces to Launcher"...

[automerger skipped] Merge "Simplify exposing external interfaces to Launcher" into tm-qpr-dev am: dc06f11e am: eee822c2 -s ours

am skip reason: Merged-In Icd0ed33bdbd68b1dd9d782b9ba1f5b4a604479ba with SHA-1 6d089c12 is already in history

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



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