Merge "Merge "Init HotwordDetectionSrvc identity earlier" into sc-dev am: aa2c737e am: e44acbc1" into sc-v2-dev-plus-aosp am: 224a6037

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

Change-Id: I3217f250db2d39fd2cc7d8cb0d5074ee3c8eab12