Merge "Merge "Fix for goat detection code" into rvc-dev am: 7588f0d7a0 am: 8ced41c780 am: a925a5c436" into rvc-qpr-dev-plus-aosp am: 83793d6200
Change-Id: Ib7ab04ac7d8c78409a7a17738fef9811f41d080a
This commit is contained in: