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

Change-Id: Ide7116bb45365a5123168291f7a771ff8944681d