Merge "Allocate new UID for OTA update resource tracking."

#define AID_TOMBSTONED    1058  /* tombstoned user */

#define AID_MEDIA_OBB     1059  /* GID for OBB files on internal media storage */

#define AID_ESE           1060  /* embedded secure element (eSE) subsystem */

#define AID_OTA_UPDATE    1061  /* resource tracking UID for OTA updates */

/* Changes to this file must be made in AOSP, *not* in internal branches. */

#define AID_SHELL         2000  /* adb and debug shell user */