Merge branch \'mnc-dr2-dev-plus-aosp\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-dr2-dev-plus-aosp
am: 07ee518281

* commit '07ee51828196e4af5fd7841c20acda96791f7f70':