tree 3421c55965b526eb7481ac46edadbbcf28e4adff
parent 01c795ec5c6321cfcde3d501501480ad2e6462d6
parent 7de5bd543e17926f0104f4c0fc0238cebb5a8ca1
author Lorenzo Colitti <lorenzo@google.com> 1616733379 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616733379 +0000

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