[automerger skipped] DO NOT MERGE Stop advertising for reconect after timeout am: d759e6cc92 -s ours

am skip reason: subject contains skip directive

Change-Id: Ia639114b1e3b56e7e9ed046ebe2c5df31ad66885