am fd0fa65e: Merge "Revert "Fix for bug: 8184401 - GridLayout accounts for child\'s size/measurements even when a child is "GONE"""

# Via Android (Google) Code Review
* commit 'fd0fa65eeae00f58863af060950e10f20971726b':
  Revert "Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE""