Merge "Fix grammar nit in comment." am: 5870ba5ace am: 03ac8973c3 am: 0169e9a372

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

Change-Id: I0f624e52c718eb24a64b901343ca1faafb3ad0a2
tree: 6176f895921718d354c209da5e04d4451dcf9b4b
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/