Merge "make carrier default app direct boot aware" am: 98ded6c9ab
am: 3f26682252

Change-Id: Ic58ee1d881a85622ce03cc7ccbba1b2e274e8760