[automerger skipped] Merge "Merge "Don't send HOME intent twice when booting from non-system user." into qt-qpr1-dev am: a58013ae18" into qt-qpr1-dev-plus-aosp
am:18e0df163f-s ours am skip reason: change_id Idd8beedf1ea034b47b9756b91404c5a043965c23 with SHA1f13851d6c1is in history Change-Id: Ie154d8a06a83dad42a13657fea843cad8f380c54
This commit is contained in: