Merge changes from topic "b204127880_pipeline_backport_1" into sc-v2-dev am: 8693114f

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

Change-Id: Iacb20471cc9d25b570c675b5f6d2d7a713a2586e