Merge "Merge "Fix ChangeClipBounds to set final clip to null." into oc-dev am:...
Merge "Merge "Fix ChangeClipBounds to set final clip to null." into oc-dev am: 8a4ff5ed" into oc-dev-plus-aosp
am: 97cb726b
Change-Id: Icbba1b2089b89351f93e8d0c3b7e18737f6d2b35