Merge changes from topic "b204127880_pipeline_backport_3" into sc-v2-dev am: a509832d9c

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

Change-Id: I31db4435cca95ceefc959d922ff40841b6cf893b