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

* commit 'e22d81debd8f2ac9432f42e4c1908da4400a1a29':