[automerger skipped] Merge "Add aconfig declarations to f/b droidstubs" into main am: 85e169c3 am: 38588bdc -s ours

am skip reason: Merged-In I944d336e474b9ed61f4554fc9325a8df3a9cf40b with SHA-1 46c6fdd5 is already in history

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



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