Merge "Revert sync app op chain changes" into sc-dev am: 50ff5ac8b8 am: f685a342c8

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

Change-Id: I2561613cf775cd7107bba4011a9362c3d9b88cd9