This reverts commit 9bbb4c3d.
Reason for revert: The config does not have to be a requirement for Android P
Bug: 78533520
Test: make
Change-Id: Icbfd813dd19dd33d652f8b8fc0b98de7440b1784
Merged-In: Icbfd813dd19dd33d652f8b8fc0b98de7440b1784
(cherry picked from commit 8ea5f5ec)