Merge "Add support for always_constrain_display_apis flag" into sc-dev am:...

Merge "Add support for always_constrain_display_apis flag" into sc-dev am: 28a6e9f9 am: 887c7965 am: 7b5f4963

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

Change-Id: I41abba469c89eaf2ee7c7fb4c9e57ea8f55a49d6