[automerger skipped] Merge "Add assets and rear display state handling in...

[automerger skipped] Merge "Add assets and rear display state handling in SideFpsController and BiometricPrompt" into udc-dev am: 0ddef87a am: 5aec21e3 am: 75f51cff -s ours

am skip reason: Merged-In If2f288514ef328391084e0be9eb4eeb82d9d34b4 with SHA-1 6e635097 is already in history

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



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