Merge "Fix issue #3431230: "am" debugging commands failing on -userdebug builds"