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: 545ce9c36a

* commit '545ce9c36a59f263b6fef224f6df73c5655ddfd9':