am a0e72d9b: [Issue 2134623] Optimizing the view_data view, which was doing a full scan of the data table.

Merge commit 'a0e72d9b20207ec244f92ace2917932990f2bc8b' into eclair-plus-aosp

* commit 'a0e72d9b20207ec244f92ace2917932990f2bc8b':
  [Issue 2134623] Optimizing the view_data view, which was doing a full scan of the data table.