Merge changes from topic "blocked-reasons-callback-tests" am: 2108a92452 am: 05c65a10f5 am: 5aa6b8d707

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

Change-Id: I4d69b1ce096d83c311620950650460024ae348c0
tree: fdaa69bc7bfd16133b544bff4ff5f791a408124c
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING