Merge "use --only-enabled" am: d613361932 am: 8180eb47e4 am: d9a4d38c8e

Original change: https://android-review.googlesource.com/c/platform/system/hwservicemanager/+/1921068

Change-Id: Ifb0e7fb9d0ff60d2f0ef7d4b913309c4b3d8fc5a