Focal: Fix aapt warnings [translation]

PS2: Prepare for merging

Change-Id: I136f2da28cf2f1a4ef757222a624cc6ed545b8f9