79eeb2d79a8ea8e628f7e35ae2c0bf88925d8b01 - platform/packages/apps/Settings

commit: 79eeb2d79a8ea8e628f7e35ae2c0bf88925d8b01
[log]
author: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Fri Jul 29 22:36:59 2022 +0000
committer: Android Build Coastguard Worker <android-build-coastguard-worker@google.com>
Fri Jul 29 22:36:59 2022 +0000
tree: d5c9737830c22ecae4a7a9b6983c6e168251b670
parent: e41cbfdd301b56e4c6f3ca38ad7116438d94f2b6 [diff]
parent: 34dac9cb7394b5bea864b23e28621296fdaf7f9b [diff]

Merge cherrypicks of [19034069, 19194541] into tm-release.

Change-Id: I5fe69b3f90b8feea172d4e5962844731a457fe70

tree: d5c9737830c22ecae4a7a9b6983c6e168251b670