drivers: ion: merge changes from d2 kernel

Change-Id: I361db4b0f1df9ae7b9c1fa5cc153a1e47e8f1cdb