This patch simplifies the code paths for assembling the advertising data
used by advertising instances 0 and 1.
Signed-off-by: NArman Uguray <armansito@chromium.org>
Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>