Merge "Match more flags to get runnable packages" into sc-dev am: 41b61007...

Merge "Match more flags to get runnable packages" into sc-dev am: 41b61007 am: 0e5a71d4 am: f9923658

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

Change-Id: I9a0d9194692d7b350e2fbb6c71d69b222de80d53