Merge "Annotate large droidstubs modules high_mem" am: 6aebdcbcb8 am: 13444871fb

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

Change-Id: I2bd10d56bb0319cb367f455bf7fa62bedb37477d