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

* commit '1e3ccd0648b2d4c2f9a3fee2a7782aea685566dc':