Merge "Update strings and UX for fgs manager" into tm-dev am: b207bfef

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



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