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: 5ff31f23

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

Change-Id: I9a8a095b4b9b3874bd5e6c0041cc0189e4dfeb87