Merge "Observe new apexd status value of "activated" as required." am: 2f11663fc9

Change-Id: I9d279cc422fcae2bf8828081d7304de10baf9832