Merge "use --only-enabled" am: ac355e8793 am: 4054734c81 am: 7dbec44ba2

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1921341

Change-Id: Iaaf608f0ef3d2c526af78db334dae56353eee59c