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

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

Change-Id: I11350a78cc7123dde29bc80d08b16cc4d566003d