Merge "Tempoarily allow priv-apps access to device identifiers"