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

* commit 'b51009dad3f4ffe06b3777073d37d344d2345090':