[automerger skipped] Merge changes from topic "drop_circular_dep" into stage-aosp-master am: 70fb81076e am: ec493198bb am: 412126eedd
am: 1cacde5b54 -s ours
am skip reason: change_id I09ad88da47540d31ad089aad5e1151a4b6877ec2 with SHA1 20426538f8 is in history

Change-Id: I46be4c755452d41fcbc52d6b9736e4480170f552