Merge "[NS02] Mix in validation of the score" am: b68825591b

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

Change-Id: I229c3033a16d6b7f11f1b3f02351cc0d2153d199
tree: f3b68226f40411323150db12c860b5f500eaa1f5
  1. framework/
  2. service/
  3. OWNERS