Merge "Make InputFilter.AllCaps constructor reject null locales" into oc-mr1-dev am: 6e8e322ea1
am: 6359944a19

Change-Id: Ib5064f4be5fd73c76ad99547746bb1cb6534c2bd