Merge "Revert sync app op chain changes" into sc-dev am: 50ff5ac8 am: f685a342 am: dcc8041a

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

Change-Id: I9a60df1b6deef04fb880623fb8ea9c3818cc6a49