Merge changes from topic "am-cb1d008a7b8441849a404796a6ccff59" into sc-v2-dev-plus-aosp am: e7d1d033

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

Change-Id: Ib94f321fb9133f3225a9c132f186db1bc9c23898