Merge "Add FSI repo" into tm-qpr-dev am: 8a83f07ae0

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

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