Merge "docs: Removed all instances of "i.e." in IntentFilter parameter descriptions." into nyc-dev
am: 4738231a55

Change-Id: Ia89da16016c4330181ecc0874c4e059f5935a814