Merge changes Ia51528f2,Id27a7809 into rvc-dev am: f45fa1bf85 am: cb2b575a9d am: a5d3b8a45c am: 78f4bcf7d8 am: 43e9c3e308
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14419442 Change-Id: Ie6037068284f376fe362617cb1076453a3fe1071
This commit is contained in: