Merge "Update janitors." am: 3486f7bf43 am: c43b1e3593 am: 16bc280947

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

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