Merge "Merge "Don't remove mainline modules if they declare support in...

Merge "Merge "Don't remove mainline modules if they declare support in manifest meta-data" into sc-dev am: 19e03e84 am: d32f01ba" into sc-v2-dev-plus-aosp am: f435fa92

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

Change-Id: I4f2049497146433702ee710ee660bd9dcd084723