Merge "Fix qs translation on split shade lock screen" into sc-v2-dev am: b90a1742 am: 4383dbd8

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

Change-Id: Ic0cbf9121f09a42a4700e4a061c4484b42e9a790