Merge "Merge "Keep finalized staged sessions in session database" into qt-dev am: 141d330086" into qt-dev-plus-aosp
am: 4c5dae0cd4

Change-Id: I86951c8c2b32e6a2ab83da83d83f52cba72e59d6