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

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

Change-Id: Ie51249f5fa47b0a5afe287083139082488f9b503
tree: 3421c55965b526eb7481ac46edadbbcf28e4adff
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING