Special case the root folder in add bookmarks

 Bug: 5505282
 The special "Other Bookmarks" folder isn't a child of the special
 "Bookmarks" folder. The merging of those two is only handled if
 the URI is CONTENT_URI_DEFAULT_FOLDER, not if a specific folder
 id is given. Thus we need to special case that in the AddBookmarkPage
 loader.

Change-Id: Ic92fba5ea8c758fc153a9cfd0c567bcfdcbc524d
1 file changed