[automerger skipped] Merge "Fix clean InProcessTethering fail problem" am: bd83df66f8 am: 5faa2ebe67 am: 32c27d52e9 -s ours
am skip reason: Change-Id I58750e4a1fe11018d83da1ebf828d1b3134ec765 with SHA-1 777bbd7f98 is in history

Change-Id: I667b12c919dacea00100dc87994a4841f5a2c966