[automerger skipped] Merge "Fix the name of the constant for device [dis]connect parameter" am: 998c4cd02f am: a8770db02d am: ad3bf06a89
am: 9c075cc251 -s ours
am skip reason: change_id I18e1e3fccad3d41372f3c5c046af4f6ffd83328b with SHA1 98f2715168 is in history

Change-Id: I894458e14b952642594dca191fde39211d9c4026