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 am: 58ee2621

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

Change-Id: Iba6333b88fae2c0498909a5290b11584ae7d87c2