Merge "Add java_aconfig_library to Android.bp" into main