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

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

Change-Id: Ie07885ba99e9eadfc37b63741c31056fb4dc2362