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

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

Change-Id: I2e050d148e478502d93bf1a999e8d079db457328