Merge branch \'mnc-dr-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/native into mnc-dr-dev-plus-aosp
am: 1e7da8dfc6

* commit '1e7da8dfc683ffdaf423c9f0c4faa3b41276b7c6':