Merge changes from topic "compos-cherry-pick" into stage-aosp-master am: 9ade5e2f

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

Change-Id: I656ca5a4475cfa8a4f24d15233c845d448633d2b