[automerger skipped] Merge changes from topic "drop_circular_dep"

am: 7153b767a5 -s ours
am skip reason: change_id I81f9614d20fbdd2f7d18340d6dbdb592e7acde06 with SHA1 01d5401dc0 is in history

Change-Id: Id03a7bdf7494b8bb86e5bf252d4cc7f6da7f0815
This commit is contained in:
Jiyong Park 2019-08-30 07:09:14 -07:00 committed by android-build-merger
commit 19dd886ec5

Diff Content Not Available