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

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

Change-Id: I7750507b390f5ad7194d3e7024d2013b7e23db2a