Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am: 2a75ecbe9d
am: 30866628b8

* commit '30866628b82b93824c08219eb4a43af26a0291df':