Merge "Non-module target." am: e518a5d38e

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

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