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: 2fd15d5e8c

* commit '2fd15d5e8c7dbefb49434670cc76a5b94899114c':