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

Change-Id: I85033f9b16cf269f1c1ce6d01789d9ed40d1cb96