Merge changes I7d29b58c,I2f1d22fb,I55e0fa2c into sc-v2-dev am: c8ee867f2d am: ca02377238

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16262278

Change-Id: Id27a7fed84ef5e33edddc4e951b77d7705d8e9be