Merge "Update janitors." am: 3486f7bf43

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

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