am bbdd20fd: am fb7eae5a: Merge "Update compat layer for API review changes to LauncherApps" into ub-now-porkchop automerge: cb213ba

* commit 'bbdd20fdcf481f67b96dd71c0ac42b5c0e4c322e':