Merge changes from topic "b204127880_pipeline_backport_2" into sc-v2-dev am: 2657c08a

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

Change-Id: I5d469e512d3964233b4ff5706637112c2894dc57