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