Brave syncer (uplift to 0.69.x)

[darkdh]

Uplift of #2010 which is required by upcoming C77 bump
#3241 is the bookmark out of order fix

#3031 and #3148 are required by #2010 so also uplift them

[kjozwiak]

@darkdh mind taking a quick look at https://staging.ci.brave.com/job/brave-browser-build-pr/job/brave-syncer-0.69.x/5/execution/node/502/log/? Seems like it failed due to too many broken tests. Example:

14:05:42  [ RUN      ] BraveSaveCardBubbleControllerImplTest.NoSignInPromoBraveSyncEnabled
14:05:42  [19/223] BraveSaveCardBubbleControllerImplTest.NoSignInPromoBraveSyncEnabled (TIMED OUT)
14:05:42  [ RUN      ] BraveContentSettingsRegistryBrowserTest.WithBraveShieldsContentSetting
14:05:42  [20/223] BraveContentSettingsRegistryBrowserTest.WithBraveShieldsContentSetting (TIMED OUT)
14:05:42  [ RUN      ] SecurityIndicatorTest.CheckIndicatorText
14:05:42  [21/223] SecurityIndicatorTest.CheckIndicatorText (TIMED OUT)
14:05:42  [ RUN      ] BraveContentSettingsRegistryBrowserTest.WithWildcardContentSetting
14:05:42  [22/223] BraveContentSettingsRegistryBrowserTest.WithWildcardContentSetting (TIMED OUT)
14:05:42  Too many badly broken tests (22), exiting now.

However, it looks like #3232 passed without any issues other than the S3 upload failure which isn't related to this particular PR.

[darkdh]

that means the CI instance has gotten into a bad state which we usually need to kill zombie processes or even restart the machine on local machine, otherwise all the browser test will keep timing out.

Wiped out the workspace and restarted a new build.

[kjozwiak]

Uplift into 0.69.x approved after deliberating with @brave/uplift-approvers. Looks like both CI/Jenkins and CI/Travis passed without any issues. @btlechowski has also gone through brave/brave-browser#2754 (comment).

Please make sure that all the correct labels are added and the appropriate issue is moved into the correct milestone.