Merge changes from topic "uid_pid with recovery mode" am: 0130a782ec

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1585103

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idac79861c7f119f7afabbb71545a97807dc51f96