Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev am: d67a1ca49b am: e3512894af
am: 6bf97365f6

* commit '6bf97365f6d9b534eb4807091d2b1611bd654191':

Change-Id: I2306b11a4e69b2d5542ace006d3612d3b55dde3b