Merge changes from topic "blocked-reasons-callback-tests" am: 2108a92452

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

Change-Id: I02f2f4458329e17ab33d792dee98ffe5f6499ad0
tree: 3088b8b23a297620c075a996ef6fe643c331130a
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING