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

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

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