[automerger skipped] Merge "From dream, FP auth brings you to the last app"...

[automerger skipped] Merge "From dream, FP auth brings you to the last app" into udc-qpr-dev am: 572daed4 am: 656a4ce5 -s ours

am skip reason: Merged-In I404b2bcaea4e88c9e217c2565af9cd55770dc88c with SHA-1 0e500d92 is already in history

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



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