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

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

Change-Id: I4a622efe89f7d116751d0243ba29441ef76e997a