Merge "Game Driver: rename GUP to Game Driver"

diff --cc core/java/android/provider/Settings.java
Simple merge

diff --cc core/proto/android/providers/settings/global.proto
Simple merge

diff --cc core/tests/coretests/src/android/provider/SettingsBackupTest.java
Simple merge

diff --cc packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
Simple merge

diff --cc proto/src/metrics_constants/metrics_constants.proto
Simple merge