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

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

Change-Id: I6706af3a5d55a13d6a2b344c5a8860838d4b6020