Merge "Deprecate unused config and make them no-op" into main am: 6cc7c9df3a am: c39420e02f

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

Change-Id: I807bbd7cb4506c1c75642f7c33b2bdc71ff1916d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>