Merge "Fix NullPointerException in PhantomProcessList due to race condition" into sc-dev am: 8b872f5c71 am: 000c176097

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

Change-Id: I10dd0c0d3f33c586ac366d9896a478752102c86b