[conflict] Merge "Change LAYOUT_SELECTION_CRITERIA IntDef" into udc-qpr-dev...

[conflict] Merge "Change LAYOUT_SELECTION_CRITERIA IntDef" into udc-qpr-dev am: 3378b8ff am: c80234a0

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



Change-Id: I3525d5857c1f8264cbf05e9907cc9d2099fca27b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>