Merge "Not allow shell to dump screen by using ui-automator if... DISALLOW_DEBUGGING_FEATURES is set" into pi-dev
am: b2c4a55405

Change-Id: I7dab7f606d55f1c0e0683edfd16a274a2b481b10