Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr-dev-plus-aosp
am: fdc7acf182

* commit 'fdc7acf182b1664351c7d5c37273386a2abc5f92':