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: 2ddc1e02 am: 95fb8eb2

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

Change-Id: I5e2ed38b33b8c7dfe800fa846e95362b9f37ea2a