Merge "Remove dogfooder opt-out via platformcompat" into sc-qpr1-dev am: 068f82dd am: 74d26d34

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

Change-Id: I84fe5d9caccca2c2bb71b79e2d367b16dcd1b265