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

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

Change-Id: I35d313c2f65750a3d22b87a0fca84963d54f56c9