Commit Graph

102799 Commits

Author SHA1 Message Date
Joshua Mccloskey
b44da73e77 Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d am: eb4fa99d5a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796

Change-Id: I950af7978c4af50afbcde4d59395780973762764
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 22:00:36 +00:00
Joshua Mccloskey
872c5b533c Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d am: 0a41ad016f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796

Change-Id: I67b2e8a129697483bd0f0a410284efb9a61fdb5f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 22:00:21 +00:00
Joshua Mccloskey
eb4fa99d5a Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796

Change-Id: I6d5b095918d499447fa67f2e0ac2b28345885e32
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 21:37:30 +00:00
Joshua Mccloskey
0a41ad016f Merge "Modified Fp -> Face setup flow" into tm-d1-dev am: e7c507070d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17874796

Change-Id: Ia50eaa82757cb61f1851bfa7c5e352646076162f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 21:37:13 +00:00
Joshua Mccloskey
e7c507070d Merge "Modified Fp -> Face setup flow" into tm-d1-dev 2022-04-25 21:14:39 +00:00
TreeHugger Robot
c0d3713453 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 6abf8e2f78 am: 3f5a3ce250
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I9a037d94d134ee9d61bfd71f8e65cac02ff00f0c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 19:16:00 +00:00
TreeHugger Robot
de8bff5446 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa am: 7e8278e3cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I6d00f1859f76d2715771c9b49d9d1b66fe736774
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 19:15:47 +00:00
TreeHugger Robot
394c83c085 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa am: bc6d056015
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I94e6a462619de1b26c9e1fe8d357913139782823
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 19:15:37 +00:00
TreeHugger Robot
3f5a3ce250 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 6abf8e2f78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: Ic0825c41a3879402d05a27bdffa48678143361aa
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 18:59:07 +00:00
TreeHugger Robot
bc6d056015 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: Ic3ea00d800f8baf0432d10be1900245a5749393d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 18:59:00 +00:00
TreeHugger Robot
7e8278e3cc Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4 am: 09c7795dfa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: Id1d714a163113bebcc44243be6f75330b6312039
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 18:58:57 +00:00
TreeHugger Robot
09c7795dfa Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I7b6f267436a95259a68e1cfcc7be3545e83e49e1
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 18:36:52 +00:00
TreeHugger Robot
6abf8e2f78 Merge "Allow intent into Privacy Controls page" into tm-dev am: 5d218d9fa4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17918639

Change-Id: I1931a6139fd93fe5781a1743b695a36ddc0c8579
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 18:35:50 +00:00
TreeHugger Robot
5d218d9fa4 Merge "Allow intent into Privacy Controls page" into tm-dev 2022-04-25 18:09:39 +00:00
Jan Tomljanovic
1e9e82e937 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: 2a9fb8aa47 am: cfd80d65f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: Ica692daa7426b5b58126b29dd9f8c71f7ee84272
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 15:14:04 +00:00
Jan Tomljanovic
973ad536c8 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: a474c51a04 am: d6c1353a80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: Ic6e6d1654463ef13c352eb3b959f1593077a790b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 15:12:55 +00:00
Jan Tomljanovic
df90e9b05f Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: 2a9fb8aa47 am: 66d62cb61e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I8d019b8af584bc5df1ee4c7d9d315a19e4703050
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 15:12:43 +00:00
Jan Tomljanovic
66d62cb61e Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: 2a9fb8aa47
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I85990569eb583b2ca2df96eca5a536ecfdc6bdbc
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 14:57:45 +00:00
Jan Tomljanovic
cfd80d65f0 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: 2a9fb8aa47
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I45d7b7dcd48b82d68d80ad72bfa1619ffec831b3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 14:57:24 +00:00
Jan Tomljanovic
d6c1353a80 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa am: a474c51a04
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I66d3322cdc54151f685d31fa71caa0bfeacd0ff3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 14:57:20 +00:00
Jan Tomljanovic
2a9fb8aa47 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I6b8ae6593ba12751b4eb2be7cea75256e18638a9
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 14:23:57 +00:00
Jan Tomljanovic
a474c51a04 Merge "Don't show back arrow in Security when in split mode." into tm-dev am: e22fa138aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17940206

Change-Id: I070dae172e3998101c04bc58edccf3aed262840b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 14:23:05 +00:00
Jan Tomljanovic
e22fa138aa Merge "Don't show back arrow in Security when in split mode." into tm-dev 2022-04-25 13:52:31 +00:00
Betty Chang
1049bce891 Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: 21b9bb97d9 am: 0027d94245
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389

Change-Id: Ia59e388cc2af3f37a47e67b29dd458985cd86a20
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 11:21:57 +00:00
Automerger Merge Worker
3fbe1e0568 Merge "Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: af1e12cf26 am: 4f1eb41a64" into tm-qpr-dev-plus-aosp 2022-04-25 11:21:42 +00:00
Betty Chang
0c49f4fa63 Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: af1e12cf26 am: 4f1eb41a64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389

Change-Id: I5fd3503f8981bac2571efad3a159f6936bb3f583
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 11:21:37 +00:00
Betty Chang
b350f15a60 Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: af1e12cf26 am: 571ef48801
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389

Change-Id: Ic8639e21713f73bea95210c1259d755751c9973b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 11:21:26 +00:00
Betty Chang
571ef48801 Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: af1e12cf26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389

Change-Id: Ib1cf8d4fbfeaee40c46574d995c112341bdb3b5a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 11:03:52 +00:00
Betty Chang
0027d94245 Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: 21b9bb97d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389

Change-Id: Ibc05a54d837f9f0dceea1a98da008d2783fb2214
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 10:59:57 +00:00
Betty Chang
4f1eb41a64 Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a am: af1e12cf26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389

Change-Id: I26da3e88b049a891f153f0c92abc9c208bf16fba
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 10:58:10 +00:00
Betty Chang
af1e12cf26 Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389

Change-Id: Ieb87da91f486efe72ef5cff43aa99982e8ad9f9f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 10:57:16 +00:00
Betty Chang
21b9bb97d9 Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev am: 662a45bc0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684389

Change-Id: Ieba054b1692260cee393b2b18554de4fe31df46f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 10:55:51 +00:00
Betty Chang
662a45bc0a Merge "[LE Audio] Add entry point in Media Volume slice for broadcast sink" into tm-dev 2022-04-25 10:39:42 +00:00
Jan Tomljanovic
ef817325bc Don't show back arrow in Security when in split mode.
Test: manual
Bug: 224427042
Change-Id: I0b0daa3981c56ba99bebda2cd34a51f3877f37a6
2022-04-25 10:37:55 +01:00
Jason Chiu
fd1dd3b62b Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5 am: a9b11b0a64 am: b013b7537f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931

Change-Id: Iea125629b94ee71fc55243c54fc9dca4f2be8612
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:32:17 +00:00
Jason Chiu
65cea8adf1 Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5 am: 89f5d2d442 am: 72087b36a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931

Change-Id: Ia67faf2199f31b007d2ea8d94c966ce6636df6bd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:31:21 +00:00
Jason Chiu
551f3e3f08 Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5 am: 89f5d2d442 am: 031dfc79a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931

Change-Id: I8f3f346afddd365ac19c75f3113d23b1819dfeea
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:30:46 +00:00
Jason Chiu
b013b7537f Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5 am: a9b11b0a64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931

Change-Id: Ia7fbbd4c1a56eafe0f65258756adc9ef9bd66fae
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:09:20 +00:00
Jason Chiu
72087b36a2 Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5 am: 89f5d2d442
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931

Change-Id: Ia498d88e3a2bb5226e5485786294b09e3b88031c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:08:59 +00:00
Jason Chiu
031dfc79a9 Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5 am: 89f5d2d442
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931

Change-Id: I0d3bb825b7f11c4763b3ad1762eb4edc07ecfc8b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 09:08:58 +00:00
Jason Chiu
89f5d2d442 Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931

Change-Id: I6944c307eba807fc351a0acd404edac6ddd1e22b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 08:46:48 +00:00
Jason Chiu
a9b11b0a64 Merge "Relaunch the account page after removing a work account" into tm-dev am: 346a40a6f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17910931

Change-Id: I58c3cd1c3ec201afea0b4189eeef6c2005780e8b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 08:45:29 +00:00
SongFerng Wang
30da3bc6d3 Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a am: 750359c7ef am: d6eca69928
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598

Change-Id: I143150b808c1398d37d491c623db6c0ca6ed1291
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 08:30:08 +00:00
Automerger Merge Worker
e517c7eddd Merge "Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38 am: a3bb653569" into tm-d1-dev-plus-aosp am: f120d4bf24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088

Change-Id: I0f32b8d9400c45cea07c2ad9dd6c88dd7cefb104
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 08:29:53 +00:00
SongFerng Wang
d754a12f46 Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a am: 78a9701de0 am: b0ea586112
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598

Change-Id: I0d6d8f561868d3a4571004f8de2b85310f80823f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 08:29:24 +00:00
Prabal Singh
a3f658f9d3 Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38 am: 888deb9328 am: 1d3cd1a563
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088

Change-Id: I523395685c27845dbfd38b60c6d539426c4a689a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 08:29:09 +00:00
SongFerng Wang
aad4bc4177 Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a am: 78a9701de0 am: 2f29b5be0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598

Change-Id: If9952706ecf46a31ca6544ad5ae2f8173afbbc27
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 08:29:01 +00:00
Prabal Singh
24278ea0d7 Merge "Use settingslib util methods for work policy info" into tm-dev am: 591c2c3b38 am: 888deb9328 am: c771c8bf94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17915088

Change-Id: Id1559aa87be9958b82e11395ec49df91baafe3c3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 08:28:46 +00:00
Jason Chiu
346a40a6f5 Merge "Relaunch the account page after removing a work account" into tm-dev 2022-04-25 08:28:43 +00:00
SongFerng Wang
2f29b5be0f Merge "Gray out the network mode UI before the carrier config is ready" into tm-dev am: 564c88485a am: 78a9701de0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17903598

Change-Id: I413c08fc365319302f5a5885c846523404e1f942
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 08:14:01 +00:00