Merge "Add FSI view binder and wm config" into tm-qpr-dev am: f6436573b4 am: fd93610d22

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

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