Merge "Radio Keepalive HAL" am: 95f0176afa
am: 3ed4ff9c74

Change-Id: Ie749848ad85b1d35b94f0bd02771dad684117005