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: f4bce5229e

* commit 'f4bce5229e0ee9b2ba8d131d8d4c931384a56bd1':