Fix missing "if" statement
Remove @Override statement that should be removed from the last revert
Frameworks/base: Second Clock (1/2)

https://github.com/Dokdo-Project/platform_frameworks_base/commit/6ab5d6299295246c34a46ffd3f5fe83cdc191cd0#diff-1fa71c270d063a48f921f0760d10c7f3R122

PS2: Fu Whitespace
PS3: small Issue

Change-Id: Ie04942ae1bb1649d18db51086b46666b56ef1ea0
Merge remote-tracking branch 'base/kitkat-staging' into kitkat-legacy-staging