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

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

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