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

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

Change-Id: I9df325234e3e01b59c0a17fc8109f1c90182613d