Merge "Change device config intervals for notification check and check for notification based on id instead of text" into stage-aosp-tm-ts-dev