Merge "Merge "[automerger skipped] Merge "Fix the parsing of longitude in MediaRecorderTest" into oreo-cts-dev am: 7091095d88 -s ours am: 29492dda86 -s ours
am: 4784f7a71f -s ours
am skip reason: change_id I866af91e587b180e681fba4cc78c3d65e1280b49 with SHA1 7bb63fac21 is in history

Change-Id: I00dcaf727cdad6ccf5747129338ff7e4c489a1f3