Merge "Distinguish no features from default features." into main am: ab1b8ec400 am: d02f9ee8f3

Original change: https://android-review.googlesource.com/c/platform/development/+/2799379

Change-Id: I75b239015f04041e266cec4b0b2106f0ff23e9b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>