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

Change-Id: I85ffa3a101074252e664ebc940ad168d49e9ee81