resolve merge conflicts of 07590428 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 07590428 and
manually apply the change.

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