Merge "Introduce device(s) role for strategy." am: 7f73ba815a am: c24c3af89d

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id31f00d038a87383f5a5ee6e4ba0d02baff0e31a