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

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

Change-Id: I4a622efe89f7d116751d0243ba29441ef76e997a
tree: 6d14c682b95398478eff8f0643295aa66e98c334
  1. framework/
  2. service/
  3. OWNERS