Merge "Revert sync app op chain changes" into sc-dev am: 50ff5ac8 am: e2942cb6 am: 5ac4c203

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

Change-Id: Ia42bec41cbe1ecda4e2789f2d4610243f6978744