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

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

Change-Id: I32d656e098564cab134b42007c7fbeccee420358