Merge "Discard invisible pending draw activity if transition starts" into sc-dev am: 42a28cc9 am: 69450dad

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14823312

Change-Id: I528e3ab9a7f1ccaf73f311ea4e65932a111bdf42