Merge "Calculate max bounds correctly in winscope" into rvc-dev am: 69939a60d2

Change-Id: Ice1077c7b4a294ab5686e2c57ea85cac64e31028