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

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

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