tree fdaa69bc7bfd16133b544bff4ff5f791a408124c
parent 1759727578d126f54b28c0929ae8ff0425afebe1
parent 5aa6b8d707851d8b28ccbfce04ff912793ae59bd
author Lorenzo Colitti <lorenzo@google.com> 1616736467 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1616736467 +0000

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