Merge "Delay boot complete broadcast for main user on HSUM." into udc-dev am: 0ad77cb1

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



Change-Id: I4a020b39b8f15e53d68e777feb167766c802b8b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>