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: 5ee15f0be3

* commit '5ee15f0be3fcc148335ff53319aac9ba9723dcf8':