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

* commit 'd0fd8cbd1d1fcfe85c7b03821c2dc400395c9900':