Merge changes Ia0035222,I309ca48c into tm-dev am: 23074210c9 am: 0e1d849838
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17119800 Change-Id: I3a0afd17318d8968d34550fe5f44e3508c812af1
This commit is contained in: