Update master#6

Merged

otopba merged 2 commits intootopba:masterfrom

Sep 20, 2019

Commits on Sep 19, 2019

Fix iOS MyLocationButton on iOS (#2068)

felangel
authored and
Michael Klimushyn
committed

Commits on Sep 20, 2019

[instrumentation_adapter] Migrate example to AndroidX (#2075)
Emmanuel Garcia
authored