Merge "[NS] Tests : don't expect a score in NF#acceptRequest" am: 96a8d7f9...

Merge "[NS] Tests : don't expect a score in NF#acceptRequest" am: 96a8d7f9 am: 435ab0ec am: ae27338a am: ca9f1d81

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id2865b0300f5db4c409ecc8ae35755053d58398d