Merge "Fix calls to Rect.intersect(Rect) in package com.android.server.wm" into mnc-dev