resolve merge conflicts of 07590428db74a2f7f9171efeb03cfd8b77599ddb to

stage-aosp-master

This conflict is because apex Sdk Version in AndroidManifest.xml and
manifest.json are different from aosp. They are from qt-dev because of
ag/8361382. I will skip 07590428db74a2f7f9171efeb03cfd8b77599ddb  and
manually apply the change.

Bug: 134997188
Test: I solemnly swear I tested this conflict resolution.
Merged-In: I02e3afc896bf9421080a6bcfa1d7fec93096fe52
Change-Id: Icdae08d7dd53cc811834a50fb48ec3af786fa68a