[automerger skipped] Refactor commitApkSession into two separate methods am:...
[automerger skipped] Refactor commitApkSession into two separate methods am: b929a547 am: bfb33f24 -s ours am: 15dec2ab -s ours
am skip reason: Change-Id I49e6b360bea09a6c68721ebc01167cef6730b4d6 with SHA-1 8c041dfd is in history
Change-Id: I45df337c5c78973e64b4c04960bb1b3ef7c97479