Revert "Support AOD in the Universal Settings API"

This reverts commit 537c2cfc2c21ffee691b11864a26bd84f043916a.

Fixes: 77278897

Change-Id: I7a5ff34bf79b87f6a7be50c2e8f421bfc4a22195
(cherry picked from commit f75edca09fd5b576a0b733dc1b699f4fd8f05752)
5 files changed