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: 8d1802f9c2

* commit '8d1802f9c27cd17e5e9469ca0b02d251cd537f53':