Merge "Serialize AM.getContentProvider() calls in client side" into pi-dev
am: 079f6d7fa6

Change-Id: I299267e20b78810002bab56488b9436456936d11