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

Change-Id: Ic3f9de6063bb605c87af8d6218c0cf7306d2c5d0