I did not try to train the model with custom data after doing the changes on the model. But what I can suggest you can train it with tf.compat.v1.disable_eager_execution() and then you save your weights and after that you enable eager execution and you do the conversion.

Yes I did deloy it to Android and it works very well.