Merge "Add a parameter to the internal FGS notification listener" into tm-dev am: e1eb2bf9

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



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