Merge "[NS02] Mix in validation of the score" am: a5323dd580 am: 211f271ce4 am: ff706470e9

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

Change-Id: I4a622efe89f7d116751d0243ba29441ef76e997a
tree: 962d0faab12b4bdd469aebe90d88813bc530f74f
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS