Merge "Camera: Avoid removing valid repeating requests"
am: 0e7782c87b

Change-Id: Iee1a2277935c0b8a5f04ef9cd85ce7cfbd3415c9