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: 175cef67ec

* commit '175cef67ec887b5f4d33a7494459c80b9a0e0895':