Merge "Fix testIsPresent when there is no geocoder package." into nougat-cts-dev am: 673d1dd90f
am: 296273136c

Change-Id: Ie5d265f31ebbdd29c4eb3db5c3a90cb97fcb37cf