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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If74f97a84dbb9382e41772c01e260fc688bfb962