Move aware and country code overriding to the base class

Bug: 319161484
Test: mobly test
Change-Id: I88f7daa3c283701c9f039b344d0b9c2f64f256c1
2 files changed