Merge "Do not clear anonymous id when anonymous@<realm> is used am: ef6ae566f2 am: a5bde47dd3" into qt-qpr1-dev-plus-aosp