Merge "Non-module target." am: e518a5d38e am: ac6f8d438c

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052094

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