[automerger skipped] Create separate api for reconciling per-sdk storage am: b9e96bf4 am: 649ed78a am: 6e4fb409 -s ours

am skip reason: Merged-In I7f144f5da4c4e10851f78d731de5dfb429fbac4d with SHA-1 92f5cf0d is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2028266

Change-Id: I781af0539804b50a47fa774b22f638777d0d817a