Merge "Make isDataCapable a public API" am: bdee4edb08

Change-Id: Icc763a920ec7e6ad780da7b70bd585f80e126454