Merge "use --only-enabled" am: d613361932

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

Change-Id: I3250a729b2d6938f3bc1f9a22ba8e004fcc1e30d