Merge "Merge "Set activity state to PAUSED when making visible from STOPPING/STOPPED" into qt-dev am: 1b33cfbc12 am: 212ed95c85" into qt-r1-dev-plus-aosp
am: 7a73da115d

Change-Id: I07bbd8430cb1ee5238e831579d23f3f1a707a9c8