Merge "Fix no features emitting." into tm-qpr-dev am: f85539b1 am: 90d47aa2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18496739



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