Merge "Only skip hierarchy op which may reorder task in task lock mode" into sc-dev am: 28c48606 am: 6e3547d7

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

Change-Id: I2272718634287d29614a98ee8148674673b57d6b