Merge changes from topic "apr16" into sc-dev am: 85e6031fb7

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

Change-Id: I69cb8391929f2223cd86f0b388c1613698f2c004