[automerger skipped] Merge "Add settings to toggle the phantom process monitoring in dev options" am: 8a9e2c51c1 am: 154d67e437 am: c0228c3791 -s ours am: 0849f38eb4 -s ours

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

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

Change-Id: Ib9240c42051e85ed725aaf64c6de6b0acb434d8a