Merge "Fix build failed of Settings test cases while importing AndroidX"