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: I19d582f586c88163f922e124b560ef4033942374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>