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

Change-Id: Iaa7fba50ae143562c7e6c432b8e6ad9f5ab44a4f