[automerger skipped] Merge "Notify activeDataSubIdChanged when data switches."...
[automerger skipped] Merge "Notify activeDataSubIdChanged when data switches." am: cf40db40 am: 7f101873
am: ae114502 -s ours
am skip reason: change_id I50d8b4ae7fdeaaa4fe96f6afbf6daaeb1a9c4e09 with SHA1 d78cd471 is in history
Change-Id: Ie7193593d65143df12f80268bdabf54568bc40c1