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

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

Change-Id: I63c16fa22d36295b9992740ea95ae69342f22307