[automerger skipped] ActivityManager: don't freeze processes holding file locks am: 80a05232 am: 64459e59 -s ours

am skip reason: Change-Id Ib7e1715effb63c1b304ce22a9451294fd9f7b10d with SHA-1 770df97b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4f55c49e7710098e028e44cda5a51777ddb92aa9