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

* commit 'fb7eae5a0f3ce5817203f8583a1e82ff58f999d6':