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: 3d6ca8017d

* commit '3d6ca8017d5fb55b5dabc290723467dd469bfabe':