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

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

Change-Id: I0e1eef0b0fc086ae33b401c8694a9abe352366cd