Merge changes I31066a6f,I081cea0d into sc-dev am: 6d6280c634 am: 68b08c590f am: 43a744334c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14822912 Change-Id: I87455adfa2c9936bc5699de8d854accd8d3a7b9a
This commit is contained in: