Merge "Add FSI view model" into tm-qpr-dev am: b2433a64 am: 595b05c5

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



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