HK transit trip from China, Indonesian citizen, do I need HK visa?

Hi, I am an Indonesian passport holder residing in Japan. I plan to go to Hainan, China. On my way back I will transit 10+ hours in Hong Kong and want to have a short trip outside HK airport. While I have a Chinese visa, should I also get a HK visa for that short trip?