Merge "Differentiate device feature checking across Device Policy tests" into lmp-sprout-dev