[automerger skipped] DO NOT MERGE Use realCallerId to check launch display for Bubbles am: af0629a53a
am: 55f5540cb5 -s ours
am skip reason: subject contains skip directive

Change-Id: I6895fea5c7d73b0fc2c5aa786c7abf9f86fca933