Merge "Flags to enable/disable smart selection in EditText" into oc-mr1-dev
am: 14ba6e10c0

Change-Id: I0ddb7b827ad8b0be37c7e1adc5a95493bd35d61f