[automerger skipped] Merge "Introduce device(s) role for strategy." am:...

[automerger skipped] Merge "Introduce device(s) role for strategy." am: 7f73ba81 am: c24c3af8 am: 6bacac85 -s ours

am skip reason: Change-Id I2ba02c6b50af80846a25010ead05c4ae364868de with SHA-1 f40141dd is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0e37c319c3099aefc84c6a0094bfb1828c013ad