Merge "Simplify exposing external interfaces to Launcher" into tm-qpr-dev am: dc06f11e

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



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