Merge "Remove unnecessary static lib from SystemUI's Android.bp" into main