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

Change-Id: Ida119f10f6f394718c35ee354d82be7224aa45d3