[automerger skipped] Merge "Partial: ActivityManager: use proc state from compiled aidl" am: bd32be9d am: 47fdcc51 am: 75278bf4 -s ours am: 04e747d0 -s ours

am skip reason: skip tag Change-Id I3dafe7a75b2dae561583a7821284027a1896b9a5 with SHA-1 42334950 is already in history

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

Change-Id: Iaa2611236565853f8184401dd4fefa01b4e9192f