Merge commit 'e4de845ec2ad14538a437ca31f56948547b2d5c0' * commit 'e4de845ec2ad14538a437ca31f56948547b2d5c0': fix 1812272 SensorManager method returns hidden object
Merge commit 'e4de845ec2ad14538a437ca31f56948547b2d5c0' * commit 'e4de845ec2ad14538a437ca31f56948547b2d5c0': fix 1812272 SensorManager method returns hidden object