Merge "AppDataHelper:fix ArrayIndexOutOfBoundsException happen in fixAppsDataOnBoot method due to forget add lock." into main am: 91ed58744f am: 98bb2ee4d5

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

Change-Id: I76c619877ae376314ad744b8d0588962865cba00
Signed-off-by: Automerger Merge Worker <[email protected]>