[automerger skipped] Merge "Add settings to toggle the phantom process...

[automerger skipped] Merge "Add settings to toggle the phantom process monitoring in dev options" am: 8a9e2c51 am: 154d67e4 am: c0228c37 -s ours

am skip reason: Merged-In I05f5b43e281b98676c615d350c213620d3d72b5c with SHA-1 e98ecfd6 is already in history

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

Change-Id: I8a0fa24ec21994f270863e7d0daa4419925f6b98