[automerger skipped] Merge "DO NOT MERGE: Fix...

[automerger skipped] Merge "DO NOT MERGE: Fix ActivityManager#killBackgroundProcesses permissions" into sc-dev am: 7ca03665 am: 1c935b0d -s ours am: 74a6b836 -s ours am: eadacd8f -s ours am: 7188821c -s ours am: 1238563e -s ours am: 1b9d6a24 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25119905



Change-Id: I687015e3dfd153d872550923fe56ee6275248345
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>