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

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

Change-Id: I229c3033a16d6b7f11f1b3f02351cc0d2153d199
tree: 6d57d4bbd41973d544e04cc8287167dad6507700
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS