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

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

Change-Id: I6485edef990cfb0fae6154ae9bb0bdad78a4d087