Merge changes Ia51528f2,Id27a7809 into rvc-qpr-dev am: d8cacc526a am: aa63f727d7 am: 879f4472ec am: 73523bcd1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14503316 Change-Id: I87f3487fd487500533bd53a81234164d5b145445
This commit is contained in: