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

am skip reason: Merged-In If2f288514ef328391084e0be9eb4eeb82d9d34b4 with SHA-1 58fcd13c is already in history

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



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