Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am: e22d81debd
am: 891e52ba29

* commit '891e52ba296a33d0e51befa209c1ce14a2746991':