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

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

Change-Id: I7e1e225d83a6394414068d389d1a30176432e071