Separate aconfigs for including session id and focused id

Rather than having a single flag control both the inclusions, it's better
to have different aconfig flags

Test: adding and modify aconfig flags
Bug: 334141398, 333927465
Change-Id: I7eb391147364991d26edf4418f93a8e6050045b4