Merge changes I99fb2ed2,Iba18bfab into sc-dev am: d2c4944cbb am: f2982d3868 am: 0568f78316
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14823310 Change-Id: If09eea313b1daade0b2a9061ce308b658e6d5006
This commit is contained in: