Merge commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d' into eclair-plus-aosp * commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d': Handle expiration of discovery mode in system server.
Merge commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d' into eclair-plus-aosp * commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d': Handle expiration of discovery mode in system server.