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

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

Change-Id: I9f628ce479db20f26a1ea1549ab11635613ccfa9