Merge "Merge "Fix for goat detection code" into rvc-dev am: 7588f0d7a0 am: 8ced41c780 am: 50148c8691" into rvc-qpr-dev-plus-aosp am: 452b13b098
Change-Id: I4f4747381c51efa8f77a7225bb5a059641dfd8c7
This commit is contained in: