am 79892c8d: Merge "Differentiate device feature checking across Device Policy tests" into lmp-sprout-dev

* commit '79892c8df4958ad33810d59fa7bfd080f1376c2b':
  Differentiate device feature checking across Device Policy tests