Merge "Adb is disconnecting during Monkey Test Run." am: 821e70ea59 am: c8a58a249d am: 3c62dd3543

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2348443

Change-Id: If51239c47ffc2ebf9c80ce5b8f2e27d8b187a871
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>