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

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

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

Change-Id: I068148a2758ce370e6ec08f629ed3c9074163be7