Merge changes from topic "blocked-reasons-callback-tests" am: 2108a924 am:...

Merge changes from topic "blocked-reasons-callback-tests" am: 2108a924 am: 6456359a am: 8afa9811

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

Change-Id: I4d69b1ce096d83c311620950650460024ae348c0