Merge "add aconfig_storage_stub as dynamic dependency for framework" into main am: 7b53ad5878 am: b2c3a34421

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

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