Merge "Fix 32-bit userspace on 64-bit kernel quota2 compatibility." am:...

Merge "Fix 32-bit userspace on 64-bit kernel quota2 compatibility." am: 04a1bf7c am: 9d400637 am: 3b2b7ee7

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1869699

Change-Id: I11f68a49bcf5949d18aa37d2d666935f174b6f82