Merge "Subscribe ActivityManagerService to receive lmkd kill notifications" am: 016131513f am: 55de7e2438

Change-Id: Ia37e99aaa00437b7c350af05a25c47f519bde0b0