[automerger] Resolve inconsistent parcel read in NanoAppFilter am: abe5a73a4a am: 2895b320b4 am: 77e6e34644 am: 49e97ea1dc am: c2cfe453f2 am: cab2fa779e am: bf8733b162 am: e9b67d2b22 am: 267b960dab
am: b9912a254a

Change-Id: Ic85c323a3b706808616e1cf9d3e30a95ca2c37f6