[automerger skipped] Merge "Merge "Client logging changes for ProcessState and...

[automerger skipped] Merge "Merge "Client logging changes for ProcessState and ProcessAssociation atoms" into tm-qpr-dev" into tm-qpr-dev am: b18ea46e am: ada70107 -s ours am: 046e005f -s ours

am skip reason: Merged-In Idd9f8f394ffab2fda75803b7c7658d2220b8735d with SHA-1 5b7ac03a is already in history

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



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