Merge cherrypicks of [4871059, 4868580, 4869372] into pi-qpr1-release

Change-Id: I42428ace2e8a383905d648626e65fdfa13dc5e93
This commit is contained in:
android-build-team Robot
2018-08-24 22:00:53 +00:00

View File

@@ -341,4 +341,9 @@
<!-- Colon separated list of package names that should be granted DND access -->
<string name="config_defaultDndAccessPackages" translatable="false">com.google.android.gms:com.google.android.GoogleCamera:com.google.intelligence.sense:com.google.android.settings.intelligence</string>
<!-- Specify model in case of attestation failure due to misprovisioned device. -->
<string name="config_misprovisionedDeviceModel" translatable="false">Pixel 2</string>
<!-- Brand value for attestation of misprovisioned device. -->
<string name="config_misprovisionedBrandValue" translatable="false">htc</string>
</resources>