am d15958f6: am 64c8a073: Merge "Early return in RemoteViewsAdapter is too late"

* commit 'd15958f661c8748b811e6b12642321f4e47f2817':
  Early return in RemoteViewsAdapter is too late