Add the actual slot ID as an extra

This is not officially supported since SLOT_KEY is hidden, and apps
should not rely on this behavior.

Bug: 123723861
Test: manual
Change-Id: I7d91ed09a169e719876c56764cbdc9c159fc2f60
(cherry picked from commit 2985ddd7)