Merge "Persist active metric status across system server" into qt-dev
am: 7ee86cdb65

Change-Id: I2ad23d6ccf4a38ec5222aa321cf167d8c9ab15fe