Merge "Add a lock around mBuffer in Archive." into sc-dev am: e9e836df am: 3f1fb8f2 am: 10759d1f

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

Change-Id: I1dd147150b43531294d10fe189f784f7bded59c5