Make sure we detect Android tablets correctly

The only way to distinguish Android tablet browser from Android mobile
browser is that Android tablet browser doesn't include the word mobile.

Also update tests.

Change-Id: Id86f0d6abb3a1baeb92312123df84c090825fe77
Merge "Make sure we detect Android tablets correctly"