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

Change-Id: Id0c3f6299e09e13811426e787893417dcc48ef17