Merge "Match both direct boot aware and unaware when updating default home." am: a10e9ca595 am: 14cb8a5290

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554659

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie03d67d5b5db4a330a7a80c88e4d4d209b647f3e