[automerger skipped] Merge "Deprecate MANAGE_ACTIVITY_STACKS permission" am: 45f922a2ff am: f9e22d7f3c -s ours

am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1731235

Change-Id: I43a6019842976af4ce3f9b250dd0fe3f262fbbbd