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

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

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