Merge "Fix build breakage on -user build" am: 8959962b am: c7b29161 am:...

Merge "Fix build breakage on -user build" am: 8959962b am: c7b29161 am: 8e736f6c am: 37c2d6a6

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



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