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 am: cb848752

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

Change-Id: I108d08b7cc431fda2d0c1ff35745a102ac7e9625