Merge "[NS02] Mix in validation of the score" am: 93a3f18a40 am: 5f96b8c585

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

Change-Id: I9f628ce479db20f26a1ea1549ab11635613ccfa9