Merge "Adding proximity endpoints to Attention Service Test: atest AttentionManagerServiceTest Bug: 214395649"