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

Change-Id: I6a8f45b2839a07a9bfae23ab41a9c6ebd1c0e5e1