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: 501a7521f0

* commit '501a7521f04efc78337b43fba7493e68926dd372':