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: a2c9a412f4

* commit 'a2c9a412f463da91bc3ae35c5ea60d8ba920a104':