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

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

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